Cleaned up form layout
UI tweaks