fixing remove component + code refactoring
fix bubble component