Update Bootstrap to 3.3.1 - Other minors adjusts