Enhance header and fix search bar grid