More cleanup and UI tweaks