Improve GUI mode