Various GUI enhancements