bit more hacking, sub navs added, working on chart for main page
Merge pull request #2 from meconlin/develop

bit more hacking, sub navs added, working on chart for main page