More sort box & filter finagling

Making the spacing and line heights of the sort and filter buttons as
consistent as possible.