Thanks to all your help mine turned out sweet here is the old and new.
The Sail panel area was a pain in the @ss Think I'm going without the visors
John