Fixed up Issues with back button