small changes for screen flow, back button not behaving properly is fixed