Cosmetic fixes (tables aligned)