layout and tiles fix