Manually merge fix for dashboard buttons