Added quit button.  fixed json conversion issues