Fixed #45 and fixed #32 - 404 widgets.