@bobsilverberg  : i have done the changes and committed on same branch of this pull request,

please review them , i am not sure about the changes , since currently i am not able to view the page with these changes, so you need to verify and confirm it.

Thank you