Update layout
Add lockpicker package