Use link helper instead of anchor tags in a few places