Improved yes/no popup window && added back button