Fix titles and spacing