Add full blocks for nav. This closes #3