Get rid of some more table for layout
RC1