Fix title ordering