Added new categories, removed third layer