Some GUI simplification