Use supervisor, move buttons to seperate page.
Fix calculations route.
Merge pull request #9 from dylanclement/S40-supervisor

S40 supervisor
Merge in master