Fixed bootstrap issues