Change widget and layout structure.

These are old versions. Please remove these from the commit.