Updated codes for Iter3

Improved UI and search result page buttons