Added the ability to display and remove categories, and made choosing a little easier