Add new category modal and componentize categories