Another major overhaul of content structure; Cleaned up view logic, but there's still more to be done