GUI-1106
more tweaks