Improving circles?

My gelding is very straight, which is awesome. His circles however... yuh not so great. I've been trying to get him to work on figure eights but that's more like doing triangles lol.

He does great on the lunge... so I know I'm just not asking right.

Advice?