Minor changes to tables & graphical layout