Updated focus onto button elements

Fixes #434