Merge pull request #121 from mr-mr/ccbranch

Small changes
Minor bugs and re-introduced the sub-nav