Issue #2398463 by amolnw2778, DickJohnson, thamas, emma.maria, LewisNyman, tadityar, lauriii, Manjit.Singh, trboslav, haasontwerp, richgilbert, pguillard, rachel_norfolk, Maninders, rteijeiro: Clean up the "content" component in Bartik

Issue #2486441 by jibla, richgilbert, entendu, emma.maria, amyvs, mradcliffe, heatherwoz, mu5a5hi, lnicks, hzakaryan: Clean up the "Search results" component in Bartik