Minor bugs and re-introduced the sub-nav