ui changes, do not really know what i should implement