Slightly improved edit form