Layout and edit form clean-up and styles