Improve GUI system