Some fixes in views