Fixed some bugs and do some change

move control panel to another class