Home page fix

Fix for calculator
Merge branch 'rr-calculatorcleanup' into staging