Layout tweaks to filter section in matrix