Make better use of table/chart space

Closes item:885