Switch to using anchor tags with href attr