Refactored views
Upated form template to use macros
cleaning up