Improving filter layout
Some todos