modify the back item & find button control
merge conflics