Some more UI adjustments