Moved some figures into some boxes