MDL-40065 theme_bootstrapbase theme_clean: Simplify column lyts / fix blocks.