some nice improvements - js and custom template tags