Updated environment detection
Dashboard folders WIP