RBAC and some js error fixed