improved with ApplicationHelper
added test for links