Followed various suggestions about the Quick Help buttons
Removing feedback button locally
TYNSTEP-1159 #resolve
Resolving merge
Merged in David's changes