Look and feel calculation
Look and feel of Calculation Page

Changed the look and feel of the calculation page.
Tried to fix my merge problem

Removed some alerts