Revert "2 new widgets and sub-stringed long names"

This reverts commit b5bce728df1cf9d96338f9973c742c762933c9c5.