Updated focus onto button elements
Merge pull request #435 from adaptlearning/issue/#434

Updated focus onto button elements