Merge the new front end branch in to develop

This should bring everything more or less inline with the dev site running on the develop branch instead of the new front end branch