Tuesday lunch - some layout tweaks
Tweaks to Keystore unlock layout