Still needs work, but it looks so much better

Before

Before

After

After