updated import/export json, minor layout crap