Dmitry batch 4 of match UI changes