added BS btn and icon (bsicon-) rules, cleaned up table rules