EditReport redesign
merge fix