Semi-working search/bunch of layout changes