Some last-minute UI tweaks