grid & layout fix