Improve GUI
Improve GUI