Improving continue button behaviour