Layout changes
Fixed scope issue