Remove unnecessary class
Add related links to calculator