GUI fixes and enhancements