Moved mixins to base mixins file and made some minor fixes in navigation