some ui changes... working