issue_78: fix Add link not highlighted when in New page. Clean up