even more gui fixes