improve the ui a bit