A lot of tweaking to the Pages views and controller