Use div element for focus
Merge branch 'develop'