some fixes
tweak combat view positions