small refactoring
Merge branch 'issue10KeyboardResize'