Improved layout
Fix bug with JSON formatting on none JSON result