Improved template and added new pages.