Removed help text block from top of page and added new help text block to the bottom, just above the save/cancel buttons.
Merge origin/master