Convert views to class-based