Small Widget Changes

Various small changes to several widget for optimization.