further improvements to filter and layout