Merge "Misc UI fixes for settings (mostly cryptkeeper)"