GUI-1210
last couple of tweaks for UX