Even made the filtering easier and improved layout