Move milestone selector to header
Merge