Fix bugs introduced by show_numbering

Seems to work for all widgets now