Added new page layout and moved stuff around