Fixed layout issue from ES JIRA