[#866923] Review fixes and fixed some UI bugs.