Move Contained functionality to Container.
Removes Contained class completely.
Also make Container extend Widget.