ui-improvements