Permissions are working in DetailPanel
Fixed merge conflicts