Fixed more layout stuff in combat