Changed to use GraphicsOverlays, fixed some task usage and unifying samples