Added all subpages, some enhancements and corrections on main navigation