Merge "Adjust margin to fix title overlapped with arrow"