#735 Use default Bootstrap structure