Broken the button row and button label row out into separate components