added filter and about to make scrollbar