Fix texts and styles
Change the layout on the diagnostic and the icon on the header