Refactored edit form to single view