Update for new lock mechanism, oled layout changes