Add margin
Add upward isearch; Fix isearch highlight to work with the margin