Re-organized hierarchy, added in basic hostility display