Solved missing X
Solved some UI problems