changes for Layout