fix some issues with bootstrap