[#4257] Fixed page back to start, and more refactors

Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>