Fixes selected state of buttons
Updates sample project
Updates README file