better style for mobile & change content
Sync with master