Refine views for smartphone.
Merge branch 'refine-smart-phone-design' into development