cleaned up some widget logic