Revert "Derp fix"

This reverts commit 5d6997508912489c7228f9dc0deb83d465866704.
Revert "View fixes"

This reverts commit 4f33f75e5367079343b83882d15dde2c72a345a9.