Tidied display of add form button, various fixes to naming conventions