Merged refactor of dashboard to trunk