Improve draw with 'focus view' on click

#114, #123