Enhanced JSON outputs and worked on UI