WIP - Cleaned up user view logic and screwed everything else up in the process