Adding keyboard layout widget

Closes #337
Revert some lines on sh in order to pass the tests.
Merge remote-tracking branch 'upstream/develop' into clean