UI and move methods improvement