Fixed layout bug and fixed filter row color