fixed edit category issue
fixed different issues
fixed different issues