I think that makes more sense
Fixing the index issue for Entries as well
Adding a line
Converting two more views to class-based views