Some Bootstrap v3 preparation tweaks