Fixes to Document Views

Fixes to Document Views