Push forced
Initial load Calculator
Commit small modifications
Minor modifications
UI refactoring