Subject: upload APK feature and minor UI changes

Description: