Fixed some changes to the way our code interacts with the RPX now gem and added some .html_safe calls to various strings