Revert "Fixed view problems"

This reverts commit 2ecadb762de8425bb734d4dcf274ed8a391f25b9.