fix bugs in movement and icons