I hope this solves the issue , Kindly check and let me know if its correct or not ! Or does it need changes.
Before :
After :