Re-ordered some widgets to keep them in alphabetical order