Improvements to edit dialog layouts