Updated flow and added confirm and thanks actions
Updated lock display