Re-committing layout changes to PIN/Pass login screens and settings activity

Accidentally over-written in merge; also deleted some unused layouts