Added Milestones and fixed some view stuff