Ok so the redraw sucked so here I fixed it

It still doesn't look right but it's 1:46 in the morning I think that can be excused for now

I'll revisit it tomorrow