Improving Milestone admin