added in type filtering and associated styles