pulled in the add-button layout fix