More work around bootstrap 3 integration.

see #585