Starting to unify the different display views into one page.
Attempt to merge?
Merge branch 'master' of github.com:bikecomps/simulation