refactored klass page