Test, layout, and tabel changes