Merge branch '28-tag-update'
Made some changes to mobile experience
Merge branch '318-mobile-updates' into staging