updated with some ui changes