layouts and other changes