Refactor partials and make html reference two columned