add user panel
Merge branch 'user_panel'