Some GUI improvements