Tweaks to some GUI classes