migrating some more views to class-based