UI changes. Some logic changes. Updated the sample jsons.