Improve GUI design