Minor adjustments on UI widgets