Improve GUI flow