Layout fix/Filter update