changed some naming of pages and adjusted style