More fixes on back button
#newsmute-57 In Progress