update for mobile ui
Merge branch 'mobile-ui'