Done refactoring formula page
Merge branch 'master' of https://github.com/Makazone/FormulaBook