update with mobile list
Merge with mobiledesign branch
merge with origin master
Update display for mobile and desktop
merge with origin master