UI tweaks and cleanup