added json
fix layout