NavigationBar search button & BugFix