Revert "View fixes"

This reverts commit 5b2063cb3aa50d771b48c4b72408fce6781ebc45.