add category badges, fix whitespace issue, etc