Some GUI modifications