ref #4028 - finalize gui, general fixes