Bootstrap 3, couple of fixes