fixed ordering and removing of components