improved table layout