Moved navigation to navbar