First 2 points of issue #3: improve GUI usability