Added styling changes and json changes