Button highlighting added, issue #3