Layout changes for sample
Listener changes and set value changes
Merge remote-tracking branch 'origin/master'