Update bottstrap and adjust templates