fix links in nav, use rails helpers and partials. deploy from dev branch