Changed layout, added new pages