Moved to class based views
More refactoring