newMethodsWorking + layoutFixes + FixesWithArrows
Merge branch 'newMethodsForCalculations' into Developer2.0