Tweak and fix GUI details