layouts and test update