Fixed potential crash, repositioned some elements