Layout fixes for filter