Fix / improve styled container widget