Fiddling around with the bootstrap layout, more HTML changes