restructured views around includes, added nav