refactered pages to make it awesome :)