Entities Bug Fixed - Plus new Widget Area