fix categories and layouts