Some zpmobile layout fixes
Fixes broken gallery page nav for zpmobile
Merge remote-tracking branch 'upstream/master'