Fixing bootstrap issues