- minor code rearrangement in BootstrapUi