Merge "Update layout so that conv items without labels dont look broken."