Finished tab toggle and moved data into JSON