refactored to use partials and link_to helpers