Added hotfixes
Changed the name of the monthly charge
Changed the name and order of some fields
Merge branch 'feature/Hotfixes'