See https://docs.google.com/document/d/13cX4GVVyCqSUjgeooe4D6TamL9PKB7TBrmJq9QQ97JA/edit#heading=h.8mi2sge5ppll for more details
AAH-238 UX fixes
AAH-530 UI improvements