layout and other changes