Getting there on the pieces

A lot of the pieces in the right panel are fixed. There're still a few
that I am tinkering with to try and get all the lines to appear, and
some appear too bold. If I can't fix it, this is at least a lot better
than it was.