Merge pull request #37 from annieccheung/search_ui

Search ui