[ux] better lock icon
[ux] change nav order