commit before testing table layout
table layout, redesign