updating UI
Merge branch 'google' of github.com:jlouthan/showApp into google