Convert the layout as an angular service
Layout improvements
Check the incident's type in his name (definitive temporal workaround)