Fix more GTS bugs

Fixed where things would dissapear when coming back from another page