Updated the page titles to use a helper
Added some design and also tidied some of the code