Removed statics from controller, fixed edit mode for change of the lock type
Locks' routines refactored