implement menu lock toggle

fixed menu toggle for lock buttons, minor other changes.