joe's gui fixes