Made some Layout changes