Small gui fixes