Reverted some wired changes.
Basic widget structure
Some cleanup