General Improvements/Configuration GUI/Locking Manager