Update button to not include secondary if required, Update CSS as well