Redid nav bar, search bar add, others