some conflicts with bootstrap are fixed
some conflicts with bootstrap are fixed