jira 387 + layout html fix