BS3 compliance

Continuing with BS3 UI compliance