fixed validation and added new pages