Improve GUI & add button