Some template and logic cleanup to make categories more consistent.