Remove Course Category
Add Club Category
Rearrange code to make it cleaner.