bootstrap and minor tweaks on components