Make navigation bar ready for per-user configuration.

Also clean it up a bit.

Change-Id: Ic10bd161fce53bf30048a0cb927dcf1e2bfa7774