Revert "Revert "Window Sizes""

This reverts commit eacb3633d8a30d74509a30f472fa5cbff7b20f26.