added Layout changes