Re-apply "some changes for control panel""

This reverts commit 0bde1e31465ed4302f8c97bccd61cc90ca4cce84.