tidied up some views etc