Done for report page and half way for report edit page