Android App improvements