[WIP] Cleanup and restructure dashboard