Updating label to BS3
Tidyup of nav - still need to blend the button into navbar