Merge "Clean up code info table layout"