Tablet mode, new json path
merging stuff