Add avatars and HP bars to the Combat dialog

HP bars still dont work.