Readd unlock button

Closes #403
Fixes #401