Implement #17, search bar UI improved.