minor ui-improvements