Remove directives
Add seperate template for new user
Seperate views for edit and new user