A few more UI tweaks