Fix potential marionette missing error
switch tables to lists, narrow field width