Merge "separate visualization building from dashboard building"