Tweaks to improve GUI