Continue with admin forms
Fixed conflicts