[TIMOB-16782] Window refactor and extras
[TIMOB-16782] Fixed more crashes
Merge pull request #218 from pec1985/timob-16782

[TIMOB-16782] Window refactor and extras