fixes and changes on UI