Add Milestones, UI changes