Some UI's fixed and Some entities modified.