Added CATEGORIES and updated index and _form