Added CRUD forms and some other stuff