Fixed some more bootstrap use issues