Upgrade to Bootstrap 3 and improve the navigation