Improved layout, added pages