Better UI initial commit