catalog ui; refactoring