Tweaks for first demo of GUI