Improved edit form layout