Fixed moving to only work on setup screen