publishing plan, plus some layout fixes