Improve GUI and request handling