Fixed issue: Cleanup edit view
Fixed issue: Added missing ACL::check