Reworked page layout and content update