resolved fully the entity mapping issues
styling changes