Fix some bug and add user admin