Updates so that both screens pull from JSON