fixed positioning of labels/added more