Get rid of the old table based layout