GUI lock/unlock mechanism will also accept string
correct button margin in SA only mode
dropping in 3.6.4