move partials as widgets, remove labbers, reorganize widgets order