Refactors forms into directives and uses views