Fix for updated nanovg class
Move nanovg perf into new widget file; Cleanup