[WIP] Adjustments on App.js