GUI changes, and added internal json provider