Some adjustments to ConvexPanel