got rid of ugly (null) labels by adding ternary operators in the label setting
added some UI fluff