Fixed wrapping issues with the btn class

Fixes #4454 

Note that these overrides should be recommended upstream to Bootstrap.