Updated navbar
Removed old layout