Modified navigational flow for better UX