Move annotation drawing into view
Fix memory leak, problems re-entering selection mode after viewing scaled subframe