Initial clean up of formatting in views/layouts files and views/department files