Reorganize order of widgets and push missing file.