Fixed up Entity class per design.
Fixed up body classes per design.