Added row filters for pre-pivot columns, layout fixes for formatters