Add surround
Add tmux navigator