And more UI finetuning