Updated for bootstrap and rmcommon 2.2