Inserted new architecture into app.js
Controller bugfixes