Added Category Form and other changes