added filtration and improved layout