UX

Graphics fix and moving fix
Revert "UX"

This reverts commit 4965573ec5a5cb16688f0671090dee48bfae391d.