Update to shiva views module cleaning it up