added labels and also some graphical changes