Fixing upvotes, after going back to polymorphic
Move locations to the front
Refactoring a bunch of views