Fix pages for tablets
Merge origin/master