Layout/fix page formatting

Fixes #253 
After I merge the other PR this should be fine - next time make sure you branch off master, please.