Removed some superflouse code.
Lots of Widget bug fixes