Added UI changes, JSON Parser