Improve square manage on panel