JSON Updates and small changes to layout