Refactor in Catalog.coffee and merge stuff