Small enhancements to GUI