Refactor Index loads

Refactor Index loads --> now they are in the app.js as it is ment to be