some refactoring and some restyling for the filtered by component