search bar moved into top navbar. fixes #190.
merge conflict resolved.