Fixed navigation and added pages