Removed unused widgets from being created
Added and removed some rules.  Slight colour changes