Made navbar menu registration unconditional.
Cleaned up coding style.