Some GUI Changes