Adding products catalog, other fixes