A few gui fixes