Lots of Art and Layout  Adjustments
Merge branch 'master' of https://github.com/taomo117/BumpAndBuyAndroidApp