Move new lines to the templates.
Change title of menu and add black diamond.