fixing bootstrap related bugs