Finished widening window (Fixes #48)