Revert "Widget changes"

This reverts commit ee79e4c26bdfd8746c268c02b836c74892d58d8b.
Revert "Widget and cucumber"

This reverts commit 26c75f6bf5783fda8ee6da11223acff05834e43f.