More tweaks to make the categories sit better.