Improvements to UILocker