minor UI changes/cleaning