Fixed field placement in edit and create views

Other minor changes