Updated css, updated filtering