Search bar and Shopping cart fixes