fixed cat collapse
Merge branch 'website' into staging2