Added remaining pages and fixed log out