Moved TRACE macro to mainwindow
Changed trace from dots to connected line(s)
Exclude wrap arround