Update Editor Lock

Fixed Editor Lock and added option button to disable messagenoticfications