FMS-325 - Make links clickable + fix text content according to prod