Revert "2x2"

This reverts commit f8c6093a4c0fab12922371f4eda7876b0cadfe82.
Revert "Two widgets in one"

This reverts commit 4033246a670e09a029cc3b6cca106cf6ba94bc75.