clean up opp-pane and search
merge conflict
sm fixes