Redid the widget hierarchy