... and some more UI tweaks.