Fix titles and layouts