Attempt at page layout rework