Update 47(e)

Several changes in charts and widgets