merge dashboard back into ui