Fix layer for UI stuff
Refactor assigning of move