catalogueWidget refactoring