Changes related to addition of component buttons.