Layout fixing + new filter