Cleans up the catalogue layout and adds an extra output for individual products