Update help icon text and position
Merge branch 'features/help-icon-and-note' into development