Numerous fixes for the Round Panels