- Added fix for back button issue