Some GUI modifications (2)