Call WorldLocationOnScreen instead of manually adding to onscreen table
Simplify simple units, support quest objectives