add sys_panel and fix some bugs
fix conflict
fix conflict