Fix Bug

Fix Bug
Fix + search bar improvement

Fix + search bar improvement