Fix titles and make better translatable