Dev cs Refactor, Dashboard layout WIP