Improves layout
Adds new layout and json