More UI clean-up - align form elements