improve ui a bit