Milestones don't collide with windows

Hopefully milestones and windows don't overlap now