修改功能及布局，未完