improve Boostrap integration