Many small updates and search bar