Improve look of form elements, more cleanups