Added additional search option and improved UI and layout.