Small improvements to UI

Small improvements to UI