pivots
histogram and pyramid widgets
merge conflict resolved