Merge "refactor dashboard_construct"