Adding tables
Some modifications to charts....