minor UI changes & cleanup