cleaned up repeating codes, added new pages