Added move icons ability and refactored code