Refresh fix and updated the back button