Fix various design thing + add text in report