Another gui fixes and enhancements