Change weapon and movement layout to esdf