CA-150463: Fixed the issue by adjusting the layout for JA