Added some client side rendering goodness