Working on unit menu and movement