Merge pull request #122 from mr-mr/ccbranch

Minor bugs and re-introduced the sub-nav