WIP scaffold, nav and docs refactoring