Merge "Fix main dashboard"