More layout improvements
Fix issue with page becoming too wide