Added labels and fixed spacing