Vivek model fixes 4

Mark,

Please pull this branch. It has tree fixes.

- get search box working
- associate word with right letter
- display correct theme in edit page.