Consolidating options and lock functionality into a single lock button surfaced a bug previously unnoticed. Resolved issues where a newly added attribute would get out of sync with lock button state, showing the options menu when locked, and hidden when unlocked.