Simplify categories.
Use layout: none for consistency.