UI fine-tune