Flow issues with new button.