Updated table layout