Added small bugfixes and cosmetic changes to Android application