Fixed returning to previous tab, doesn't return if removing other tab
Fixed merge