Added Layout changes