Changed back to using advanceModal for setup complete to avoid breaking mode switch #689