Full updated app, with controllers and Json

Wrapped into one long, not pretty pull request