added many ui changes