Small fixes in views