Minor adjustments to UI