Bug fixes and delete for views