Fixes for Safari. Refactor hitbox type locations