bootstrap layout, some tests fixed