Added more pages as well as getting the user from the headers.