refactor to BS3
update TODO comments to include [todc-bootstrap]