Updated masterpage, tidy up some markup and added some JS script