Fixes and changes on UI