Updated annotation to take json
Fixed grid and its annotations, added the final bus grid (I hope)