better layout and working filter