lines dots and group labels fixed (not 100% ready yet)