Remove unused references and other small fixes
Modify navbar in the layout