Upgraded BS and set nav to match new design