Story 49871451: Major fixes around help modal