Merge pull request #168 from bvleur/fix-page-admin-layout

Fix page admin layout
Merge remote-tracking branch 'upstream/master'