Add 'lock' feature, Update UI