Changed routing system, and added some new pages