Better page routing
Added the page helpers