Reduce level size to the screen size
Merge branch 'topic/ghi/12' into dev

Fixes Github issue #12