Minor improvements to edit view. Cucumber tests don't pass