table layout and content format improvements