improving some bootstrap functionality