More changes to the markup for compatibility with bs3