Fixing bootstrap headache + a bunch more stuff