Revert "some changes for control panel"

This reverts commit 6a813fed78e6a9ef17e39632df6ec9b88cfdb7cc.