Android layout update and program erase bug fix
Merge pull request #1 from ColdSnickersBar/master

Erase program bug fix and layout update