Added milestones and loading indicator