Add search and fix title