A better way to add windows