Widget Optimizations

Just a small number of widget optimizations.