moved search control in UI
Merge branch 'master' of github.com:surevine/neon