Another gui fixes/enhancements