More Bootstrap 3 cleanup
Fix up labels