Bud Nosen Citabria cabin question
 

Hello help!! I need some insight as to how to finish this cabin issue on my Bun Nosen Citabria. I purchased this plane with this issue so I don't know how it looked before the previous owner tried to fix the problem. I've seen the cabin top with a single layer of balsa but not this 3 layer build. I have to replace the windshield but not sure how the final fit would be at the cabin top where the windshield would meet the front edge. Not sure if windshield would over lap the curved top or sit under it.
https://cimg4.ibsrv.net/gimg/www.rcu...fed6c646c7.jpg
https://cimg8.ibsrv.net/gimg/www.rcu...2f48019d64.jpg
https://cimg7.ibsrv.net/gimg/www.rcu...726b7ca7fc.jpg
https://cimg4.ibsrv.net/gimg/www.rcu...e80c804ae0.jpg
https://cimg2.ibsrv.net/gimg/www.rcu...cb17ebaf8e.jpg
https://cimg0.ibsrv.net/gimg/www.rcu...7c8010867d.jpg