Increased horizontal margin for buttons on Android; other UI tweaks