Working forms and view clean ups