A bunch of changes so that the new user view works (minus milestones)