All steps added. Fixed bugs on calculator and personal data pages