entity website widget bug fix and refactor