Manually merge fix for dashboard buttons part 2