Added some more widget definitions