Layout/fix page formatting

Fixes #253