bug fix and UI tweaks for better phone experience

final merge?