Tidied up some HTML, forms, views