Rationalised data table in basic mode for issue #17.