Changed the style of the navigation. Added in choice of graph time, graph now defaults to 6hours but can be changed with buttons.
Merge branch 'master' into gh-pages