Modified to draw the item divider and the annex properly