Totally arrange the whole app, for two states // still not working but at least I know how it is arranged