Further GUI enhancements