MDL-43822 theme_bootstrapbase: blocks less tidied and reorganised

Thanks Gareth for the peer-review.