Added Working Settings Page and Re-Calc button. Try and change transition between views