Save and restore toolbar position
Password encrypt bug fix