Some more UI finetuning