Improved rendering in Jive 6 and keeping correct rendering for older versions. #1