some edits, minor link_to refactoring