Fix links to data forms page + formatting