Fixed some issues and added new pages