Add missing widgets and using a single wibox