Make Toolbars keyboard accessible

Fixes #17
Make Toolbars keyboard accessible - improve and simplify the code

Fixes #17