Re-factored dual Sonar plot code

#16 #15 #6 #3