Multi files filter properly, updated layout