fixed merge error
reimplemented the body panel