Included Injury time and a few layout fixes