Refactor education

View after Category and Company PR.