Bootstrap 3.1.1 and minor fixes