add gui fixes from 1.6 branch