added report widget
merge conflicts