Fight gui improvements