Few fixes and updates to UI