Refactored links using url helper