Improve GUI slightly