Replace hardcode with catalogue template
Extract catalogue list method