Adding new pages and improved code style