Re-structure and add flexibility to the navigation bar