Revert "View fixes"

This reverts commit 8951a751a0b73fe685af96f7da83b48f091040de.