Add focus listener
Merge branch 'develop'
Implement lazy rectangle rendering