Add helper method and modify views, both in order to improve link display/function