added caching
made partials and fix nav
integrated second form. Working well.
fixed merge conflict from master