Updates

- Fixed json
- Added App functionality