added message, remove duplicated css class in icon, added recalcualte bf function