Added checking for empty structure labels and fixed spacing