State Pension Calculator - content  and logic update, bug fix

Details about the changes in the commits' body
https://www.agileplannerapp.com/boards/105200/cards/5601