Rework page layout