Titles modified now using a helper class to properly render the titles