am a00673c7: Fix issues with the new widget layout

* commit 'a00673c7d9f3fcfc81a6e1c6aa7b831951331e84':
  Fix issues with the new widget layout