Small fixes, new bootstrap_button template tag